Make the the GtkAction{Toggle,Radio,}Entry* arguments to the

Tue Aug  3 20:16:26 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkactiongroup.[hc]: Make the the GtkAction{Toggle,Radio,}Entry*
	arguments to the gtk_action_group_add_..._actions() functions const,
	since the most common use case is to use a static array.  (142334,
	Mariano Suarez-Alvarez)

diff --git a/ChangeLog b/ChangeLog
index bf54146ea0eca52e8f28250c6bca6ce662b805e3..8228b1b597819a2b71bdc0ad0f0072c8dee49d0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug  3 20:16:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.[hc]: Make the the GtkAction{Toggle,Radio,}Entry*
+       arguments to the gtk_action_group_add_..._actions() functions const, 
+       since the most common use case is to use a static array.  (142334, 
+       Mariano Suarez-Alvarez)
+
 Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bf54146ea0eca52e8f28250c6bca6ce662b805e3..8228b1b597819a2b71bdc0ad0f0072c8dee49d0f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Aug  3 20:16:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.[hc]: Make the the GtkAction{Toggle,Radio,}Entry*
+       arguments to the gtk_action_group_add_..._actions() functions const, 
+       since the most common use case is to use a static array.  (142334, 
+       Mariano Suarez-Alvarez)
+
 Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bf54146ea0eca52e8f28250c6bca6ce662b805e3..8228b1b597819a2b71bdc0ad0f0072c8dee49d0f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Aug  3 20:16:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.[hc]: Make the the GtkAction{Toggle,Radio,}Entry*
+       arguments to the gtk_action_group_add_..._actions() functions const, 
+       since the most common use case is to use a static array.  (142334, 
+       Mariano Suarez-Alvarez)
+
 Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bf54146ea0eca52e8f28250c6bca6ce662b805e3..8228b1b597819a2b71bdc0ad0f0072c8dee49d0f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Aug  3 20:16:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkactiongroup.[hc]: Make the the GtkAction{Toggle,Radio,}Entry*
+       arguments to the gtk_action_group_add_..._actions() functions const, 
+       since the most common use case is to use a static array.  (142334, 
+       Mariano Suarez-Alvarez)
+
 Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index e4f456beafd9cec66aa41eae35f2be2143f4c449..8edff4210486f27dd7b0f0f8f1c31b91cb6d98ed 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -308,7 +308,8 @@ gtk_action_group_finalize (GObject *object)
   if (self->private_data->translate_notify)
     self->private_data->translate_notify (self->private_data->translate_data);
 
-  (* parent_class->finalize) (object);
+  if (parent_class->finalize)
+    (* parent_class->finalize) (object);
 }
 
 static void
@@ -683,10 +684,10 @@ gtk_action_group_list_actions (GtkActionGroup *action_group)
  * Since: 2.4
  */
 void
-gtk_action_group_add_actions (GtkActionGroup *action_group,
-                             GtkActionEntry *entries,
-                             guint           n_entries,
-                             gpointer        user_data)
+gtk_action_group_add_actions (GtkActionGroup       *action_group,
+                             const GtkActionEntry *entries,
+                             guint                 n_entries,
+                             gpointer              user_data)
 {
   gtk_action_group_add_actions_full (action_group, 
                                     entries, n_entries, 
@@ -731,21 +732,26 @@ shared_data_unref (gpointer data)
  * Since: 2.4
  */
 void
-gtk_action_group_add_actions_full (GtkActionGroup *action_group,
-                                  GtkActionEntry *entries,
-                                  guint           n_entries,
-                                  gpointer        user_data,
-                                  GDestroyNotify  destroy)
+gtk_action_group_add_actions_full (GtkActionGroup       *action_group,
+                                  const GtkActionEntry *entries,
+                                  guint                 n_entries,
+                                  gpointer              user_data,
+                                  GDestroyNotify        destroy)
 {
 
   /* Keep this in sync with the other 
    * gtk_action_group_add_..._actions_full() functions.
    */
   guint i;
+  GtkTranslateFunc translate_func;
+  gpointer translate_data;
   SharedData *shared_data;
 
   g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
 
+  translate_func = action_group->private_data->translate_func;
+  translate_data = action_group->private_data->translate_data;
+
   shared_data = g_new0 (SharedData, 1);
   shared_data->ref_count = 1;
   shared_data->data = user_data;
@@ -757,8 +763,16 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group,
       const gchar *label;
       const gchar *tooltip;
 
-      label = gtk_action_group_translate_string (action_group, entries[i].label);
-      tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip);
+      if (translate_func)
+       {
+         label = translate_func (entries[i].label, translate_data);
+         tooltip = translate_func (entries[i].tooltip, translate_data);
+       }
+      else
+       {
+         label = entries[i].label;
+         tooltip = entries[i].tooltip;
+       }
 
       action = gtk_action_new (entries[i].name,
                               label,
@@ -803,10 +817,10 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group,
  * Since: 2.4
  */
 void
-gtk_action_group_add_toggle_actions (GtkActionGroup       *action_group,
-                                    GtkToggleActionEntry *entries,
-                                    guint                 n_entries,
-                                    gpointer              user_data)
+gtk_action_group_add_toggle_actions (GtkActionGroup             *action_group,
+                                    const GtkToggleActionEntry *entries,
+                                    guint                       n_entries,
+                                    gpointer                    user_data)
 {
   gtk_action_group_add_toggle_actions_full (action_group, 
                                            entries, n_entries, 
@@ -828,20 +842,25 @@ gtk_action_group_add_toggle_actions (GtkActionGroup       *action_group,
  * Since: 2.4
  */
 void
-gtk_action_group_add_toggle_actions_full (GtkActionGroup       *action_group,
-                                         GtkToggleActionEntry *entries,
-                                         guint                 n_entries,
-                                         gpointer              user_data,
-                                         GDestroyNotify        destroy)
+gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_group,
+                                         const GtkToggleActionEntry *entries,
+                                         guint                       n_entries,
+                                         gpointer                    user_data,
+                                         GDestroyNotify              destroy)
 {
   /* Keep this in sync with the other 
    * gtk_action_group_add_..._actions_full() functions.
    */
   guint i;
+  GtkTranslateFunc translate_func;
+  gpointer translate_data;
   SharedData *shared_data;
 
   g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
 
+  translate_func = action_group->private_data->translate_func;
+  translate_data = action_group->private_data->translate_data;
+
   shared_data = g_new0 (SharedData, 1);
   shared_data->ref_count = 1;
   shared_data->data = user_data;
@@ -853,8 +872,16 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup       *action_group,
       const gchar *label;
       const gchar *tooltip;
 
-      label = gtk_action_group_translate_string (action_group, entries[i].label);
-      tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip);
+      if (translate_func)
+       {
+         label = translate_func (entries[i].label, translate_data);
+         tooltip = translate_func (entries[i].tooltip, translate_data);
+       }
+      else
+       {
+         label = entries[i].label;
+         tooltip = entries[i].tooltip;
+       }
 
       action = gtk_toggle_action_new (entries[i].name,
                                      label,
@@ -904,12 +931,12 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup       *action_group,
  * Since: 2.4
  **/
 void            
-gtk_action_group_add_radio_actions (GtkActionGroup      *action_group,
-                                   GtkRadioActionEntry *entries,
-                                   guint                n_entries,
-                                   gint                 value,
-                                   GCallback            on_change,
-                                   gpointer             user_data)
+gtk_action_group_add_radio_actions (GtkActionGroup            *action_group,
+                                   const GtkRadioActionEntry *entries,
+                                   guint                      n_entries,
+                                   gint                       value,
+                                   GCallback                  on_change,
+                                   gpointer                   user_data)
 {
   gtk_action_group_add_radio_actions_full (action_group, 
                                           entries, n_entries, 
@@ -934,31 +961,44 @@ gtk_action_group_add_radio_actions (GtkActionGroup      *action_group,
  * Since: 2.4
  **/
 void            
-gtk_action_group_add_radio_actions_full (GtkActionGroup      *action_group,
-                                        GtkRadioActionEntry *entries,
-                                        guint                n_entries,
-                                        gint                 value,
-                                        GCallback            on_change,
-                                        gpointer             user_data,
-                                        GDestroyNotify       destroy)
+gtk_action_group_add_radio_actions_full (GtkActionGroup            *action_group,
+                                        const GtkRadioActionEntry *entries,
+                                        guint                      n_entries,
+                                        gint                       value,
+                                        GCallback                  on_change,
+                                        gpointer                   user_data,
+                                        GDestroyNotify             destroy)
 {
   /* Keep this in sync with the other 
    * gtk_action_group_add_..._actions_full() functions.
    */
   guint i;
+  GtkTranslateFunc translate_func;
+  gpointer translate_data;
   GSList *group = NULL;
   GtkRadioAction *first_action = NULL;
 
   g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
 
+  translate_func = action_group->private_data->translate_func;
+  translate_data = action_group->private_data->translate_data;
+
   for (i = 0; i < n_entries; i++)
     {
       GtkRadioAction *action;
       const gchar *label;
       const gchar *tooltip; 
 
-      label = gtk_action_group_translate_string (action_group, entries[i].label);
-      tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip);
+      if (translate_func)
+       {
+         label = translate_func (entries[i].label, translate_data);
+         tooltip = translate_func (entries[i].tooltip, translate_data);
+       }
+      else
+       {
+         label = entries[i].label;
+         tooltip = entries[i].tooltip;
+       }
 
       action = gtk_radio_action_new (entries[i].name,
                                     label,
@@ -1033,10 +1073,7 @@ dgettext_swapped (const gchar *msgid,
  * 
  * Sets the translation domain and uses dgettext() for translating the 
  * @label and @tooltip of #GtkActionEntry<!-- -->s added by 
- * gtk_action_group_add_actions(). Note that GTK+ expects all strings
- * to be encoded in UTF-8, therefore the translation domain must have
- * its codeset set to UTF-8, see bind_textdomain_codeset() in the 
- * gettext() documentation. 
+ * gtk_action_group_add_actions().
  *
  * If you're not using gettext() for localization, see 
  * gtk_action_group_set_translate_func().
@@ -1055,36 +1092,6 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
                                       g_free);
 } 
 
-/**
- * gtk_action_group_translate_string:
- * @action_group: a #GtkActionGroup
- * @string: a string
- *
- * Translates a string using the specified translate_func(). This
- * is mainly intended for language bindings. 
- *
- * Returns: the translation of @string
- *
- * Since: 2.6
- **/
-gchar *
-gtk_action_group_translate_string (GtkActionGroup *action_group,
-                                  const gchar    *string)
-{
-  GtkTranslateFunc translate_func;
-  gpointer translate_data;
-
-  g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), string);
-
-  translate_func = action_group->private_data->translate_func;
-  translate_data = action_group->private_data->translate_data;
-
-  if (translate_func)
-    return translate_func (string, translate_data);
-  else
-    return string;
-}
-
 /* Protected for use by GtkAction */
 void
 _gtk_action_group_emit_connect_proxy  (GtkActionGroup *action_group,

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 26c50410e691951cb48d323655bdcff413007425..75d9d070268aadc8ea3c565727a026de18be4d95 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -104,64 +104,62 @@ struct _GtkRadioActionEntry
 };
 
 GType           gtk_action_group_get_type                (void);
-GtkActionGroup *gtk_action_group_new                     (const gchar          *name);
-const gchar    *gtk_action_group_get_name                (GtkActionGroup       *action_group);
-gboolean        gtk_action_group_get_sensitive           (GtkActionGroup       *action_group);
-void            gtk_action_group_set_sensitive           (GtkActionGroup       *action_group,
-                                                          gboolean              sensitive);
-gboolean        gtk_action_group_get_visible             (GtkActionGroup       *action_group);
-void            gtk_action_group_set_visible             (GtkActionGroup       *action_group,
-                                                          gboolean              visible);
-GtkAction      *gtk_action_group_get_action              (GtkActionGroup       *action_group,
-                                                          const gchar          *action_name);
-GList          *gtk_action_group_list_actions            (GtkActionGroup       *action_group);
-void            gtk_action_group_add_action              (GtkActionGroup       *action_group,
-                                                          GtkAction            *action);
-void            gtk_action_group_add_action_with_accel   (GtkActionGroup *action_group,
-                                                          GtkAction   *action,
-                                                          const gchar *accelerator);
-
-void            gtk_action_group_remove_action           (GtkActionGroup       *action_group,
-                                                          GtkAction            *action);
-void            gtk_action_group_add_actions             (GtkActionGroup       *action_group,
-                                                          GtkActionEntry       *entries,
-                                                          guint                 n_entries,
-                                                          gpointer              user_data);
-void            gtk_action_group_add_toggle_actions      (GtkActionGroup       *action_group,
-                                                          GtkToggleActionEntry *entries,
-                                                          guint                 n_entries,
-                                                          gpointer              user_data);
-void            gtk_action_group_add_radio_actions       (GtkActionGroup       *action_group,
-                                                          GtkRadioActionEntry  *entries,
-                                                          guint                 n_entries,
-                                                          gint                  value,
-                                                          GCallback             on_change,
-                                                          gpointer              user_data);
-void            gtk_action_group_add_actions_full        (GtkActionGroup       *action_group,
-                                                          GtkActionEntry       *entries,
-                                                          guint                 n_entries,
-                                                          gpointer              user_data,
-                                                          GDestroyNotify        destroy);
-void            gtk_action_group_add_toggle_actions_full (GtkActionGroup       *action_group,
-                                                          GtkToggleActionEntry *entries,
-                                                          guint                 n_entries,
-                                                          gpointer              user_data,
-                                                          GDestroyNotify        destroy);
-void            gtk_action_group_add_radio_actions_full  (GtkActionGroup       *action_group,
-                                                          GtkRadioActionEntry  *entries,
-                                                          guint                 n_entries,
-                                                          gint                  value,
-                                                          GCallback             on_change,
-                                                          gpointer              user_data,
-                                                          GDestroyNotify        destroy);
-void            gtk_action_group_set_translate_func      (GtkActionGroup       *action_group,
-                                                          GtkTranslateFunc      func,
-                                                          gpointer              data,
-                                                          GtkDestroyNotify      notify);
-void            gtk_action_group_set_translation_domain  (GtkActionGroup       *action_group,
-                                                          const gchar          *domain);
-gchar          *gtk_action_group_translate_string        (GtkActionGroup       *action_group,
-                                                         const gchar          *string);
+GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
+const gchar    *gtk_action_group_get_name                (GtkActionGroup             *action_group);
+gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
+void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
+                                                         gboolean                    sensitive);
+gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
+void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
+                                                         gboolean                    visible);
+GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
+                                                         const gchar                *action_name);
+GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
+void            gtk_action_group_add_action              (GtkActionGroup             *action_group,
+                                                         GtkAction                  *action);
+void            gtk_action_group_add_action_with_accel   (GtkActionGroup             *action_group,
+                                                         GtkAction                  *action,
+                                                         const gchar                *accelerator);
+void            gtk_action_group_remove_action           (GtkActionGroup             *action_group,
+                                                         GtkAction                  *action);
+void            gtk_action_group_add_actions             (GtkActionGroup             *action_group,
+                                                         const GtkActionEntry       *entries,
+                                                         guint                       n_entries,
+                                                         gpointer                    user_data);
+void            gtk_action_group_add_toggle_actions      (GtkActionGroup             *action_group,
+                                                         const GtkToggleActionEntry *entries,
+                                                         guint                       n_entries,
+                                                         gpointer                    user_data);
+void            gtk_action_group_add_radio_actions       (GtkActionGroup             *action_group,
+                                                         const GtkRadioActionEntry  *entries,
+                                                         guint                       n_entries,
+                                                         gint                        value,
+                                                         GCallback                   on_change,
+                                                         gpointer                    user_data);
+void            gtk_action_group_add_actions_full        (GtkActionGroup             *action_group,
+                                                         const GtkActionEntry       *entries,
+                                                         guint                       n_entries,
+                                                         gpointer                    user_data,
+                                                         GDestroyNotify              destroy);
+void            gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_group,
+                                                         const GtkToggleActionEntry *entries,
+                                                         guint                       n_entries,
+                                                         gpointer                    user_data,
+                                                         GDestroyNotify              destroy);
+void            gtk_action_group_add_radio_actions_full  (GtkActionGroup             *action_group,
+                                                         const GtkRadioActionEntry  *entries,
+                                                         guint                       n_entries,
+                                                         gint                        value,
+                                                         GCallback                   on_change,
+                                                         gpointer                    user_data,
+                                                         GDestroyNotify              destroy);
+void            gtk_action_group_set_translate_func      (GtkActionGroup             *action_group,
+                                                         GtkTranslateFunc            func,
+                                                         gpointer                    data,
+                                                         GtkDestroyNotify            notify);
+void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
+                                                         const gchar                *domain);
+
 
 /* Protected for use by GtkAction */
 void _gtk_action_group_emit_connect_proxy    (GtkActionGroup *action_group,